Merge #1eae173fafa9b29 from CICE-Consortium #21
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…sortium#429) * Update implementation of some optional arguments in Icepack - Remove local copies where possible - Check optional arguments Remove public interface declarations where not needed Clean up some intent statements * Add write_diags argument to icepack_init_fsd_bounds Update documentation * Clean up meltsliq implementation in icepack_step_therm1
…tten in NetCDF format (CICE-Consortium#427) * Trial fix for netCDF start time problem * driver: icedrv_history: fix start time for NetCDF history output The start time for netCDF output was hardcoded to be at 00:00:00 and there was a bug in icedrv_calendar such that idate0 was fixed at Jan. 1. Both bugs are fixed. NOTE: if dt and istep0 are set such that the start time contains fractional seconds, they will be rounded down in the NetCDF output to the nearest integer. * driver: icedrv_history: fix start time for NetCDF History output Start of netCDF time axis is fixed at Jan. 01 00:00:00 of init_year and time value calculation is now fixed. * Added restart_format variable to icedrv_restart_shared and to namelist. No functionality implemented yet, just checking it's added correctly. * need to also add new namelist to icepack_in * Added error handling for incorrect restart format, should probably update final_restart at some point * NetCDF restart file created, next need to populate fields * NetCDF Restart output is now populated * if block error handling in restartfile * driver: icedrv_restart: enabled restart/ice_ic files to be written/read as NetCDF Added the option for restart (aka initial condition) files to be in NetCDF instead of binary for ease of setting custom inital conditions * modified set_nml.ionetcdf to default to netcdf restart files if we set ionetcdf * Fixed error in which some tracers were not being writting. NetCDF restart files are now identical * fixed istep1 = istep0 but and added test_suite for netcdf * removed bgc from the netcdf restart test suite * put netcdf functions into conditional compilation blocks * Removed unused variables (sec0, h0, m0, s0) from icedrv_history * Removing unused variables in icedrv_history (after merging in from consortium-main) * Changed history_cdf namelist to history_format and updated documentation * Fixed warning message if restart_format is incorrect * halfway done reorganizing restartfile * finished reorganization in restartfile, need to do dumpfile next * Halfway done editing dumpfile * finished editing dumpfile * updated namelist settings and documentation. all tests pass * removed the netcdf_nobgc test suite * Fix minor issues found during testing - icedrv_init write format for history_format - dims allocation in icedrv_restart - cleaned up some intent lines (old) - add return at end of io_suite.ts - update namelist documentation of history_format, restart_format Update to current main trunk * Update history_format default Check history_format and restart_format input values --------- Co-authored-by: apcraig <[email protected]>
* FSD bug fixes for lateral melt and weld * put back declare sicen * another small welding fix * Change print statements to use icepack_warnings * Fix some comments * Fix some comments * Fix some comments * Check for wlat present when tr_fsd = .true. * Fix some syntax errors --------- Co-authored-by: cmbitz <[email protected]>
* update documentation to fix latex (pdf) errors
…o icep230317 Merge #1eae173fafa9b29 from CICE-Consortium main to branch, March 19, 2023
eclare108213
requested changes
Mar 20, 2023
| @@ -174,13 +174,15 @@ variable ``dumpfreq``. The namelist variable ``ice_ic`` contains the | |||
| pointer to the filename from which the restart data is to be read and | |||
| the namelist option ``restart`` must be set to ``.true.`` to use the file. | |||
| ``dump_last`` namelist can also be set to true to trigger restarts automatically | |||
| at then end of runs. | |||
| at then end of runs. The default restart file format is binary and is set | |||
There was a problem hiding this comment.
change 'then' to 'the'.
Also, the 'set by setting' language is a little weird. How about
The default restart file format is binary, set in namelist as
restart_format = 'bin'. For netCDF, setrestart_format = 'nc'.
?
| @@ -197,7 +199,8 @@ written, the USE_NETCDF C preprocessor directive must be set during compilation. | |||
| is done by setting ``ICE_IOTYPE`` to ``netcdf`` in **icepack.settings**. In addition, | |||
| the machine env and Macros files must include support for compilation with NetCDF. The | |||
| ``icepack.setup -s`` option ``ionetcdf`` will set the ICE_IOTYPE to netcdf, which turns on | |||
| the USE_NETCDF C preprocessor. ``ionetcdf`` also sets the ``history_cdf`` flag to true. | |||
| the USE_NETCDF C preprocessor. ``ionetcdf`` also sets the ``history_format`` and | |||
| ``restart_format`` flags to 'nc'. | |||
There was a problem hiding this comment.
It looks like set_nml.ionetcdf is empty now. Is that true?
There was a problem hiding this comment.
Correct, will fix that on Consortium version as well.
|
I realize that this PR is for changes that have already been made in the Consortium code, so it's not the right place to make corrections. |
|
I'll fix the documentation on the Consortium version when I have a chance. Agree it's best not done here. |
eclare108213
approved these changes
Mar 24, 2023
eclare108213
merged commit 5f4cd19
into
E3SM-Project:cice-consortium/E3SM-icepack-initial-integration
apcraig
added a commit
to apcraig/Icepack
that referenced
this pull request
Apr 17, 2023
Fix documentation noted in E3SM-Project#21 Fix documentation in issue CICE-Consortium#430 and CICE-Consortium#422
16 tasks
apcraig
added a commit
to CICE-Consortium/Icepack
that referenced
this pull request
Apr 18, 2023
Fix documentation noted in E3SM-Project#21 Fix documentation in issue #430 and #422
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR checklist
Merge #1eae173fafa9b29 from CICE-Consortium
apcraig
This passes all testing on cheyenne with Icepack and CICE. Regression vs current Consortium main indicates Icepack is bit-for-bit except modal tests (expected). CICE is bit-for-bit except restart files have different values of Tf on non-ice areas (expected), log files show bit-for-bit in those cases.
This merge